From 5363075ebd3208d159bf636803acd34433e5c98c Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 3 Jul 1999 23:31:50 +0000 Subject: [PATCH] Handle Control-digits specially. * gdk/win32/gdkevents.c (gdk_event_translate): Handle Control-digits specially. --- ChangeLog | 7 ++++++- ChangeLog.pre-2-0 | 7 ++++++- ChangeLog.pre-2-10 | 7 ++++++- ChangeLog.pre-2-2 | 7 ++++++- ChangeLog.pre-2-4 | 7 ++++++- ChangeLog.pre-2-6 | 7 ++++++- ChangeLog.pre-2-8 | 7 ++++++- gdk/win32/gdkevents-win32.c | 19 +++++++++++++++++++ gdk/win32/gdkevents.c | 19 +++++++++++++++++++ 9 files changed, 80 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index e67d24854b..5eff882753 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,13 @@ +1999-07-04 Tor Lillqvist + + * gdk/win32/gdkevents.c (gdk_event_translate): Handle + Control-digits specially. + 1999-07-03 Tor Lillqvist * gtk/makefile.{cygwin,msc}: New pthreads version. Use gettext. -Mon Jun 28 10:03:07 1999 Tor Lillqvist +1999-06-28 Tor Lillqvist * gdk/win32/gdkimage.c (gdk_image_get): bpl was set wrong for bitmaps, should be multiple of 4. (Thanks to Hans Breuer for diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index e67d24854b..5eff882753 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,8 +1,13 @@ +1999-07-04 Tor Lillqvist + + * gdk/win32/gdkevents.c (gdk_event_translate): Handle + Control-digits specially. + 1999-07-03 Tor Lillqvist * gtk/makefile.{cygwin,msc}: New pthreads version. Use gettext. -Mon Jun 28 10:03:07 1999 Tor Lillqvist +1999-06-28 Tor Lillqvist * gdk/win32/gdkimage.c (gdk_image_get): bpl was set wrong for bitmaps, should be multiple of 4. (Thanks to Hans Breuer for diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e67d24854b..5eff882753 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,8 +1,13 @@ +1999-07-04 Tor Lillqvist + + * gdk/win32/gdkevents.c (gdk_event_translate): Handle + Control-digits specially. + 1999-07-03 Tor Lillqvist * gtk/makefile.{cygwin,msc}: New pthreads version. Use gettext. -Mon Jun 28 10:03:07 1999 Tor Lillqvist +1999-06-28 Tor Lillqvist * gdk/win32/gdkimage.c (gdk_image_get): bpl was set wrong for bitmaps, should be multiple of 4. (Thanks to Hans Breuer for diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index e67d24854b..5eff882753 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,8 +1,13 @@ +1999-07-04 Tor Lillqvist + + * gdk/win32/gdkevents.c (gdk_event_translate): Handle + Control-digits specially. + 1999-07-03 Tor Lillqvist * gtk/makefile.{cygwin,msc}: New pthreads version. Use gettext. -Mon Jun 28 10:03:07 1999 Tor Lillqvist +1999-06-28 Tor Lillqvist * gdk/win32/gdkimage.c (gdk_image_get): bpl was set wrong for bitmaps, should be multiple of 4. (Thanks to Hans Breuer for diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index e67d24854b..5eff882753 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,8 +1,13 @@ +1999-07-04 Tor Lillqvist + + * gdk/win32/gdkevents.c (gdk_event_translate): Handle + Control-digits specially. + 1999-07-03 Tor Lillqvist * gtk/makefile.{cygwin,msc}: New pthreads version. Use gettext. -Mon Jun 28 10:03:07 1999 Tor Lillqvist +1999-06-28 Tor Lillqvist * gdk/win32/gdkimage.c (gdk_image_get): bpl was set wrong for bitmaps, should be multiple of 4. (Thanks to Hans Breuer for diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index e67d24854b..5eff882753 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,8 +1,13 @@ +1999-07-04 Tor Lillqvist + + * gdk/win32/gdkevents.c (gdk_event_translate): Handle + Control-digits specially. + 1999-07-03 Tor Lillqvist * gtk/makefile.{cygwin,msc}: New pthreads version. Use gettext. -Mon Jun 28 10:03:07 1999 Tor Lillqvist +1999-06-28 Tor Lillqvist * gdk/win32/gdkimage.c (gdk_image_get): bpl was set wrong for bitmaps, should be multiple of 4. (Thanks to Hans Breuer for diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index e67d24854b..5eff882753 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,8 +1,13 @@ +1999-07-04 Tor Lillqvist + + * gdk/win32/gdkevents.c (gdk_event_translate): Handle + Control-digits specially. + 1999-07-03 Tor Lillqvist * gtk/makefile.{cygwin,msc}: New pthreads version. Use gettext. -Mon Jun 28 10:03:07 1999 Tor Lillqvist +1999-06-28 Tor Lillqvist * gdk/win32/gdkimage.c (gdk_image_get): bpl was set wrong for bitmaps, should be multiple of 4. (Thanks to Hans Breuer for diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c index e01740f132..e197e006ee 100644 --- a/gdk/win32/gdkevents-win32.c +++ b/gdk/win32/gdkevents-win32.c @@ -1528,6 +1528,25 @@ gdk_event_translate (GdkEvent *event, event->key.keyval = GDK_F15; break; case VK_F16: event->key.keyval = GDK_F16; break; + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + if (GetKeyState (VK_CONTROL) < 0) + /* Control-digits won't come in as a WM_CHAR */ + event->key.keyval = GDK_0 + (xevent->wParam - '0'); + else + { + ignore_WM_CHAR = FALSE; + event->key.keyval = GDK_VoidSymbol; + } + break; default: if (xevent->message == WM_SYSKEYDOWN || xevent->message == WM_SYSKEYUP) { diff --git a/gdk/win32/gdkevents.c b/gdk/win32/gdkevents.c index e01740f132..e197e006ee 100644 --- a/gdk/win32/gdkevents.c +++ b/gdk/win32/gdkevents.c @@ -1528,6 +1528,25 @@ gdk_event_translate (GdkEvent *event, event->key.keyval = GDK_F15; break; case VK_F16: event->key.keyval = GDK_F16; break; + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + if (GetKeyState (VK_CONTROL) < 0) + /* Control-digits won't come in as a WM_CHAR */ + event->key.keyval = GDK_0 + (xevent->wParam - '0'); + else + { + ignore_WM_CHAR = FALSE; + event->key.keyval = GDK_VoidSymbol; + } + break; default: if (xevent->message == WM_SYSKEYDOWN || xevent->message == WM_SYSKEYUP) { -- 2.30.2